From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 5 Feb 2011 04:45:16 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4685^2~69
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3ef4e9c14b7c39742b86e7a8cfbcd22b2f513fca;p=emacs.git

Merge from mainline.
---

3ef4e9c14b7c39742b86e7a8cfbcd22b2f513fca